Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Jan 2011 01:09:09 +0000 (17:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Jan 2011 01:09:09 +0000 (17:09 -0800)

Trivial merge